Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Mon, 8 Mar 2010 12:05:51 +0000 (13:05 +0100)
committerJan D. <jan.h.d@swipnet.se>
Mon, 8 Mar 2010 12:05:51 +0000 (13:05 +0100)
commit7725fb4acc29c1807b987b8d68f774f2433bfa02
tree692ffc86f01d28063e76ff15f8906b5af36066bc
parent0c87da9fb7bae7af374815f93bd284d6484522fa
parent2ac6b26de7c9f02d7153c33b3f8839465d7eb58d
Merge from trunk